From a2beab833b24c850c1a8347b60ea02d2436e5ba9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 Jan 2004 00:58:48 +0000 Subject: [PATCH] Avoid a compiler warning. (#122725, Kjartan Maraas) Tue Jan 27 02:00:37 2004 Matthias Clasen * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a compiler warning. (#122725, Kjartan Maraas) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeitem.c | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1d6658d3b..347a3c4474 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 27 02:00:37 2004 Matthias Clasen + + * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a + compiler warning. (#122725, Kjartan Maraas) + Tue Jan 27 01:46:54 2004 Matthias Clasen Make menus work better on Xinerama (#126150): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1d6658d3b..347a3c4474 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Jan 27 02:00:37 2004 Matthias Clasen + + * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a + compiler warning. (#122725, Kjartan Maraas) + Tue Jan 27 01:46:54 2004 Matthias Clasen Make menus work better on Xinerama (#126150): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e1d6658d3b..347a3c4474 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Jan 27 02:00:37 2004 Matthias Clasen + + * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a + compiler warning. (#122725, Kjartan Maraas) + Tue Jan 27 01:46:54 2004 Matthias Clasen Make menus work better on Xinerama (#126150): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e1d6658d3b..347a3c4474 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Jan 27 02:00:37 2004 Matthias Clasen + + * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a + compiler warning. (#122725, Kjartan Maraas) + Tue Jan 27 01:46:54 2004 Matthias Clasen Make menus work better on Xinerama (#126150): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1d6658d3b..347a3c4474 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Jan 27 02:00:37 2004 Matthias Clasen + + * gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): Avoid a + compiler warning. (#122725, Kjartan Maraas) + Tue Jan 27 01:46:54 2004 Matthias Clasen Make menus work better on Xinerama (#126150): diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index e98e7208d7..d2036c3c8b 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -393,14 +393,14 @@ gtk_tree_item_add_pixmaps (GtkTreeItem *tree_item) gdk_pixmap_create_from_xpm_d (GTK_WIDGET (tree_item)->window, &pixmap_node->mask_plus, NULL, - tree_plus); + (gchar **)tree_plus); /* create pixmaps for minus icon */ pixmap_node->pixmap_minus = gdk_pixmap_create_from_xpm_d (GTK_WIDGET (tree_item)->window, &pixmap_node->mask_minus, NULL, - tree_minus); + (gchar **)tree_minus); tree_item->pixmaps = pixmaps = g_list_prepend (pixmaps, pixmap_node); } -- 2.30.2